fix(napi): Make napi_wrap work on regular objects #15622
+940
−109
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
190n
changed the title
src/bun.js/bindings/napi.cpp
Outdated
|
|
||
| if (!refPtr) { | ||
| return napi_object_expected; | ||
| if (!hasNapiWrap(vm, globalObject, jsc_object)) { |
There was a problem hiding this comment.
This calls getDirect twice. We only need to call it once. Let's call it once.
src/bun.js/bindings/napi.cpp
Outdated
| } else if (auto* val = jsDynamicCast<NapiClass*>(value)) { | ||
| ref = val->napiRef; | ||
|
|
||
| if (!hasNapiWrap(vm, globalObject, jsc_object)) { |
There was a problem hiding this comment.
This also calls getDirect twice
src/bun.js/bindings/napi.cpp
Outdated
| } else { | ||
| ASSERT(false); | ||
| JSValue contents_value = jsc_object->getDirect(vm, propertyName); | ||
| RETURN_IF_EXCEPTION(scope, napi_pending_exception); |
There was a problem hiding this comment.
We don't need to check for exceptions when using getDirect
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Currently, napi_wrap only works on instances of Node-API classes. This PR will make it work on any JavaScript object.
Fixes #15383, which is occurring in
@napi-rs/canvasand eventually in more projects because of napi-rs/napi-rs#2348How did you verify your code works?
Added tests and passes the existing ones.